Add Stop and Reconnect support