Worked on the ServiceFactory