Made NPC and Quest payload extraction optional