added Map Class