Refactored RepositoryArgumentTransformer