I suggest dropping the hint on `$repository`. That allows for building a macro-loader that can select the correct repository instance based on a simple switch/map logic eventually.