Improved hhvm support