Add more pubsub handlers for dying