Updated to support NPC jsons