Modified model defs