Simplified the pub/sub process