Added AutoConnect option