Refactored the item uid