Update to switch statements