Upgrade to Symfony2