Refactor of the object model