Refactored lookup and moved into Target's controller.