Identity-V3 support with tokens support