refactor modelDefConverter