Designed more of the pub/sub system using a simplified query approach.