Updated class comments