updated to support symfony 2.1