Modified to the new item class.