Add mappings to move fast