External annotations improved
Improvements