Added some more queries