Small changes to the modeling stuff