Updated to support golang changes