BatchScrapMachine and EventGenerator updated