Provider API improvements