Improvements to Item code