Updated/reworked item and related classes