Added support for variable width