Added token creation to User data model