Updated to use entity manager resolutions.