Use new node builder