Added switchover support