modified driver for ease of use
Expanded dict