Update to work with Symfony 2.3