ENH: API upgrade.