Adding ability to query data