improved mappings