Added more queries