changes for sandstorm's data_backends merge