Added support for item attributes