Item class changes
Revert "Item class changes"

This reverts commit 9c074829a5bc639d52be974499003467f073728e.