Load List options from Model

- Updates to xsd, etc
- Some robustness improvements

Change-Id: I4dda710a8baed8d143b945f1cb6b8a73e83a6efd