Improved the versioning