Address bugs w/ connections
Stop using extraParams