Update factory for Service to be relevant