Updated to use ConnectionModifier