Use locate control directly from repo