Adding version checking