Added version checking