Updated to fix object deserialization from JSON