Add enchantments
Rewritte parts of code