added name and class info