Add annotation-based data support