Added ITargetFinder interface and store.