Event service improvements