add Query interface