Updated deserialization code as per suggestion of @ngoto