Annotation just for classes

Merge of annotation