switched to named mappings