Refactor DataTable classes