Adding static event support