Few changes to map