Make events allowed more generic