Added in some more queries for NPCs