Improved ItemFactory