Add in the pieces for event notifications (#1091).