New mappings (+ fixes)