updated deserialization support