Amended Map Class