Added defaults to switch blocks