Allow modelProperty.type to be any value instead of object

/to @raymondfeng 
/cc @bajtos