Start refactor for columns and statuses