Added a couple more queries