Added map.
Moved map to a separate class.