More API work.