Updated ClassMap