Update initial draft API