I was thinking of making all the UAVO enums available, instead of just a handful. We would place the generated code with a $(FOOBAR) tag, just like the other templates. I agree that if the goal isn't to put them all there, then this approach is better.