Now using Doctrine 2.4