Refactoring and added support to tree columns at Column Picker