Updates for token granting