New API to replace annotations
2 files changed