Further annotate the whole codebase