Switch structure added