Update for Go Lang support