Updated implementation of CLI provider interface