Add support for .go