Add more class info