More API improvements