Refactor datarequestcenter