Moved QueryResult to new query package
Generified QueryResult