added more query_interface