More optimizations for items