Update to work with latest doctrine modules