Updated packages, revised RepositoryFactory