Adding additional provider support for Cabot