New API in progress (2).