@Override public G next() throws NoSuchElementException { G next = features.next(); String featureId = next.getIdentifier().getID(); Ref ref = typeTree.get(featureId); String versionId = ref == null ? null : ref.getObjectId().toString(); return VersionedFeatureWrapper.wrap(next, versionId); }