Added Z-Ray compatibility