LPS-35057 Adding annotations for automatic indexing