Backup commit
Token refactored to UserTokenData + Fixed Numerics reference