Reorganized sample data
Extend the model to allow for required/optional data