Added terminal creation and validation on switch