Now using RandomEventGenerator instead of deprecated RandomOptionGenerator