Adding mappings to more modes