Fix item count
Better proxy lookup
Lazy lookup