Connection controller changes