Event services improvements