Model changes to make more pythony