Added support for account endpoint