Added support for variable width items