improved some mappings