Several improvements and fixes to current governor implementation.
Renamed governor to gvn