update to fit PSR-4