General API improvements