Fixed class definitions to fit PSR-2