changes for federated mode