Added ServiceFactory