make mappings better