Adding "GO" support