Added Latch provider support