Progress on working in ApiAnnotations, and fully Delta processing