Removed dependency on data providers.
Fixed #220.