added method to deal with Data_Model property.
Merge remote-tracking branch 'origin/develop' into develop