Improved VillagerAPI