Few updates to the item classes and their usage