Add data providers support