improve ModelDefConverter