Appended handling of categorical/continuous EVs.
Appended handling of continuous/categorical EVs.