Item component refactoring.