Add gotags support