Refactor and add DataTable