Adding more return tables to WQP output.