Updating references to data source layout fields