Updated to be compliant with PSR-4