- Added handling all datatable entries