Removed ItemType. Add code to ItemFactory