Initial PHP 5.4+ compatibility