Revert "change Item class"

This reverts commit f3958c20c1a884b708adb9a42025366d338ecb2f.