add enums and rename properties per DAC