Add option to return metadata with query