added queue and topic