Forum to table refactor