Refactoring (introduced plan-column)