Added Switch events full flow