Shouldn't be the signal's shim in a different module, so that we do not impact the event one?