Updated for hhvm