Added and revised Annotations for Classes and Properties.