Updated Authentication and Token Expiration