Added support for repo discovery