Update class level annotation documentation and implementation after discussion with Tony Butterfield