Refactored tokens models