Added enhanced support for golang