Tinkered with the generator's approach for enums