+ removed ServiceFactory class