Added checks for Item's type and category