APOLLO-3946 Updated annotations