Incorporated annotation handling