HCSVLAB-604 Change structure of annotations