Add in full PHP 5.6 support