Added Arrow handling
Added Infinity enchantment handling