Added RobotMap changes