Architecture of enumerator was changed.

Signed-off-by: 80LevelElf <salahutd@gmail.com>