Added a switch field