Making the default model match the data

We add all of these values eventually so they should be there in the default.