TreeView filling refactored