UP-3987: Update table to use datatable