Brent, When you have time could you clue me on to a test or something that will help me convert metadataProvider.getEntityDescriptor(relyingPartyId); to the new MetadataResolver, please ? I assume a MetadataFilter is needed ...