Add Friend class
Clean up AccountList