now with enumerations back

enum <-> string round tripping

just need to add back the support in the model objects