Changed uid field for account_number and modified raw_info origin.