Add Account_id into struct