Enumeration refactor based on new Classes InterleavedArray and VersionNuber