Reworked Datatable