Updated to reflect improved enchant API