Even more refactoring of the object model