All around: add annotations and API guards