New API in progress.