add more mappings features