Added parse_sender_info + code refactor WIP.