Added additional GO support.