More work on UDA support for deserializer