Connection lease moved to a single method