Improve version spec