Added NPCFactory