Adding basic support for linked services