Improve versioning further