CHANGES: Small changes in Items Handling