Added support for gotags