New Annotations Detector + Fixes

New Code  plus Refactoring. Changes might be needed.