Small refactor. Fixing DataTable.