Items refactor.