move token storage language to later