Made it more in line with Symfony best practices