[BUGFIX] Adapted to the ContentType -> NodeType changes