Starting to add support for remote data.