Add connect and disconnect configuration options
Make default options final