Added pub/sub to framework