Changed to use version ranges