Add query interface