Addes support for manual setting of item class