Added support for query return fields