Added support for return fields and improved expression support