Made a bunch of change to Model, adding output and replace old property construction with new property construction

clean up old convention in Model

Fix a bunch of bugs, take care of string property parsing so that it treats the whole property value as a single string in case that the property allows only one value.

clean Model a little bit