Some more API work.