Adds items collection support
Improves ordering