Reduce number of instance variables for the Map class