some changes to dynamic mapper