Improve go support