Generalized the Event selector system.