improving event support