Updated to include more account information