Update to new version system