Added Map and MapCanvas class