Changes to use multiple key/value verses array