[Merge] [Add] Classy Map
[suite] [Merge][Add] Classy Map