Some refactoring of the object model