Changed QueryResult to use HashMap