Heuristic classification rules added