Added extra repository + standard streamlining