CFY-1761 simplify mappings