Villager model changes