Shaped now works

Shaped support, need enchantment support