Several changes in Item class templates.