Added support for width and height