Added <measure> to <extent>, <height>, etc.