Improve some mappings