Update to data_mapper_setup