A screen to accommodate AND/OR type of questions

I need to design an architecture that can accommodate AND/OR questions based on categories. An admin can configure the questions each quarter. Current architecture supports multiple questions for a category but requirement is to support AND/OR type of questions.

Category Personal :

1. What is your name?
2. What is your current address?
3. What is your permanent address?

New requirement :

1. What is your name?
2. What is your current address?
   OR
   What is your permanent address?
3. What is your home phone number?
   OR
   What is your cell phone number?

It should also update UI to accept such questions. The current UI :