Re: Backward-compatible role annotations