More work on Rhino datamodel