Add support for Client disconnect or Server disconnect