Update ContextFactory interface