Cleaned up ServiceFactory