Added support for account fetching