Add annotation-access support for #527