Added the canonical definitions of the model objects