Removed traits for PHP 5.3 compatibility