[#64000952] Add model structures and fill in missing parameter types