APOLLO-2304 Added in missing annotations