Removed field vars.
Added queues.