Adding unmarshalling support for remote data