Really minor, but do you think it makes more sense to pass repository object instead of reposito id in the context?