Slightly improved versioning