Changed npcs data structure