Added in Connect/disconnect events