Fix and improve PSR-4