More changes to the enchantment objects