Updates to Villager and NonPlayableCharacter