Added partial handling of unmarshaling JSON