Connection construction changes