Observer and Pub/Sub Added