AND-100: Add annotations (blocking calls).

Maybe raise this as a Jira ticket, and we can do it separately? I'm not sure if it breaks anything else.