Version detection added