Add support for any ContextFactory