Added checks for requested version