Add helper class for our static code
Codegen now uses helper code