Filling out the models a bit more.