Adding in event support