Changed representation of keys into tables