Minor change in variable names.
Add query generation scripts.