Refactor. Changing the way objects are created in the Factory. Factory
should be used for more than just consumables.