Replace mock enum with real enum
Replaced generators with initial nodes