Bugfixes
Added leafclassobject/rootclassobject