Rest changes for PHP 5.4