refactoring of EnumeratorContext
ValueObjectSetId deleted