Tweak to psr-4