Change finder naming and introduce annotation based lookup
Increase test coverage to >80%
Test annotated lookup