More refactoring on FederatedQueueManager