Added map classMap class