Working on better class information.