ER-42 - Changes the way of injecting core services, fixes 500 error in the controller