Change connection handler to non-unique