Adapted annotation fetching to use map format