Added raw activity event support