More villager model changes