BUG-1440: improve CompositeNodeDataWithSchema