Updated for Symfony 2.2