New Annotations Detector + Fixes

New Code  plus Refactoring. Changes might be needed.
I can merge this, just add a TODO or something for later.