Adds logic to use either shipping or billing address