SingletonRepository refactoring