Refactor DataManage