Add in go -> Go mapping