Improve the versioning part