Updated to handle different repositories