Fix IDs and CLASS