Improve version information handling