APOLLO-4589 Missing annotations