Fix binding provider support