Updated villager inheritance