Added wildcards and enchantment checks