Add map and collision handling