PHPDoc fixes
Performance fix: when traits were being used - they would always trigger the autoload file to be regenerated