Small Stream refactor, ItemDefinition refactored