Make more compatible with projects using Symfony 2.2