Data_mapper_setup modified