More robust versioning