New Annotations Detector + Fixes

New Code  plus Refactoring. Changes might be needed.
We should call this class differently. Something like DriverProgramAnalysis would be a bit better.