Code Changes to decrease the number of Item Classes needed