Changes for connection options cofigurable