Made PSR-4 compatible