Fixed deserialization with new API