NS. Migrated to new code generators