added node types and related changes