Add cleaned up switch models