Inject service and entity locators properly. Get rid of static injector field and default constructors.