-Made rule R12.
-Refactored TargetExtractorService (needs more refactoring)