Change to Symfony Best Practice