changed dictionary key handling