Adding support for account API