added some support for items