adding support to optional ship address CPF