Refactor on item type