[FEATURE] Add support for subcontext