Merge "Add new Query class for debugging"