Refactor of movement mappings