Refactor data_mapper_setup