Finally fixed class info