API improvements