[WIP] Support new spec.