Items refactoring.