Map is now in the Parser Class integrated