Refactor column table