Updated signalwatcher and socketconnector