Switch to platform independency