More work on publish and subscribe