Added device & application classification definition