Added additional verification to item management