update to mapper and class
Mapper & Class