Added Pub/Sub implementation