Added min/max-width/height support