More update for Switch case