Doctrine 2.1 upgrade to 2.3