Stabilize draft API