Porting over DB changes
Added hhvm support