Added ContextFactory