Modified the data structure for key data