Added support for token expiration