A few changes in item processing