Adds comments and runtime exception to EventSupport