improve Item classes