Added enum from json support