Update to new repository system