Improve version command