Added Query capability