Add support for height/width options