M1: Map class added