Add Enum demarshalling handling
3 files changed