Add rafsi annotiations