Additions to key handling, iteration by name