Changing API for table data acquisition to be dynamic