Refactor to use new generic table.