Refactor Item class builder