Simplify JSON deserialization significantly