We could support bundle better for go