bringing back App event management - see #266