Adding node hierarchy support and the foundation for expansions.