- refactored PublishSubscribe / added deferred queue to client