Added auto-connect