Improve auto connect