Fixing on ServiceFactory integration with Framework.