Added new Map class.
Minor change.