Updating the table to be more generic