Finish adding pubsub handlers for individual entities