improves annotation handling