More item composition work.