Adding ability to query