WEDT-2 Add Classification mechanism
WEDT-2 Add Classification mechanism