improve version handler