A major update to work with Symfony2.1 +