Add movable object for map
merge conflict