Added support for item data