NodeCollapser fixes, new NodeModel creation methods on NodeFactory, WorkspaceModel