Upgrade to doctrine instantiator