Added additional parent fields. Handling same_address checkbox.