Enhance the context assembler