PSR3 to PSR4 change