Changes due to the addon in go-dialog package