Updated override annotations

Next step is to implement own version of pdfviewer