Added enchantment support