Token map optimizations

Description

None

Environment

None

Pull Requests

None

Assignee

Unassigned

Reporter

Olivier Michallat