small refactor, making clear that context maps is used