Add deserialization support :ship: