Add stuff for Go