Simplify versioning