Refactor: move lookup methods out of Repository