First cut.
Fix deserialization of nested objects