Moved up skip_federated