add remote data support