Updated generation of classes and enums.