Change from plain GOLANG to using GVM