Make repo a bit more collection agnostic