Fix for new default exchange type, add exchange type parameter, fix for new signedIdentityToken