Implemented more queries