Started adding RiftSupport.