Improved pubsub table