Renamed `context_map` to `subcontext`