Support metadata and subaccounts