Adding connection handler support.