Data_mapper_setup added