Updated with Connection options