Refactored Item List classes