Added enchantment and xp bottle support (tested)