Refactorings, support for shared token