Added generic Map class.