Reverted to simple datatables