Improve NPC saving and loading commands