Modified model definitions