More API improvements.