Added support for items