Improved ItemFactory
Added names to AmourType Switch