Now PSR-4 compliant