adjust class mapping