Use same treatment as item components
Use same treatment as item components