Moved query pubsub message topics to separate container class