Made generated code compatible with nsb beta 3