Fix datatable implementation