Updated for go runtime