Reworked NPC storage