Better itemWidth support