APOLLO-3179 Updated annotations