Improve version number generator