Work on supporting source, fix for tree view