Refactor of core tokens, additional support