Improved oculus support