Add handover dto parsing (some ugly bits)