Generic concepts have been changed into variables and domains