Added all new NPC module stuff