More robust version management