Finish work on CitizensNPCRegistry