Changed converter + added NodeLabelId