Improve versioning to be more realistic