Added support for manual setting of itemClass