Change mono connection handling