improve Go mappings