Upgraded SDK
Some minor refactoring before introducing TreeViewParsed stuff