Added checks for "custom items"