Added more switches