Adjustments for the distinction between constraints and filters
Adjustments for new annotation format (non-JSON)