Issue #1962358 by grom358: Replaced calls to token_info etc to the Token service