Extended model a bit.