Handling of repo and repo_source added.