change ServiceFactory to have core services
force using constants as service name