Searching for missing targets. Some refactoring.