Added option to disable data table