Added first and last name as well as opt-in