A lot of fixes for the internal structural object for handling multiple models.
Authored by: bugman 2011-11-03
Parent: [r14968]
Child: [r14970]
