Fixes #1518: Add annotation/prog API support