Finished integrating first query interface