Updated class commetns