Changed to use topics instead of queues