New update of map and handling odd cases for parsing.