Changes to user go generate