Add width/height support