Fixed items to new format