Improvements to connection template