Refactor for Item