Continuing on PHP 5.3 migration