Updated switch on strings