Added PropertyMetadata model; maybe PropertyData would be better....