Switch data source and improve linking