Fixed issue with model properties. Now returns empty object with hasValue=false