Enhance install and connect