Changes needed for SKV and remote livre data source