Add support for switches