Further work on the object model