RepositoryManager improvements