Added fields to a couple models