Added advanced villager entity mapping