Added Rift support