Changes needed for remote livre data source