Removed the use of String for the Map