Some other stuff because of psr-4