enhanced mapping and context