add query capabilities add index and blablabla