made performant querying interface make more sense