Changes for golang ws