Refactor ImportSearchReferences task

Moves towards instance centric design