Added per RP token type support