Json parse fix
Automatic Enum Mapping added