#15 Support multiple repositories - part 2