Add item names for forward compatibility