Update to latest Jazz. Conert kwlist to maps to accommodate jazz changes