Handle villager instance constructor better