Improve GCE support