Item, ItemSet refactoring