Add Data Helper and refactor.