WIP: Added support for PHP 5.3