Improve performance when migrating to Google Cloud