Update for scanning precision, exceptions and singleton jar's.