Enhance App\Event generator