Update and simplify draft API spec