Resolve "Update the models to address the new resource state model"

Kostis Trantzasrequested to merge
12-update-the-models-to-address-the-new-resource-state-model into develop

Closes #12

Merge request reports