"Token" model has been refactored