An enhancement wrapper for Pub/Sub