improve go mappings