Now uses ItemType