Update for golang plugin support