Revamp of the Object model to further relax cohesion.