Add additional changes for DeclarativeEnum.