Change on data_mapper_setup