Annotations optimization