First rev of auto-repository discovery