Modifications to support integration with existing Ding-based annotation implementation