Adding support for multiple repositories