Updated switch statements to allow case insensitive matches