Rewrite annotation functions